fix a segfault in the a11y code

svn path=/trunk/; revision=20813

diff --git a/ChangeLog b/ChangeLog
index 4c763940cfd1304543b459583addecd3102312e0..5774a751b824a054e5195e59148df5e1507e7ed4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-10  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 542234 – iconview a11y implementation segfaults
+
+       * gtk/gtkiconview.c: Fix a segfault in the a11y code.
+       Patch by Li Yuan.
+
 2008-07-08  Christian Neumair  <cneumair@gnome.org>
 
        * gtk/gtkuimanager.c (update_node):

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 792d65c619b56d72370aa24070646d9695f521e2..b71004c23be888559082186bad0fdd3a87fea581 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -8970,8 +8970,8 @@ gtk_icon_view_accessible_model_row_deleted (GtkTreeModel *tree_model,
         {
           if (tmp_list == NULL)
             tmp_list = items;
-          else    
-            info->index = item->item->index;
+            
+          info->index = item->item->index;
         }
 
       items = items->next;
@@ -8981,11 +8981,8 @@ gtk_icon_view_accessible_model_row_deleted (GtkTreeModel *tree_model,
     {
       info = deleted_item->data;
       gtk_icon_view_item_accessible_add_state (GTK_ICON_VIEW_ITEM_ACCESSIBLE (info->item), ATK_STATE_DEFUNCT, TRUE);
-    }
-  g_signal_emit_by_name (atk_obj, "children_changed::remove",
-                         index, NULL, NULL);
-  if (deleted_item)
-    {
+      g_signal_emit_by_name (atk_obj, "children_changed::remove",
+                             index, NULL, NULL);
       priv->items = g_list_remove_link (priv->items, deleted_item);
       g_free (info);
     }